diff --git a/fe/src/lib/Chart.svelte b/fe/src/lib/Chart.svelte
new file mode 100644
index 0000000..b19d932
--- /dev/null
+++ b/fe/src/lib/Chart.svelte
@@ -0,0 +1,63 @@
+
+
+
\ No newline at end of file
diff --git a/fe/src/lib/DataView.svelte b/fe/src/lib/DataView.svelte
index 0a6b81b..5e81a5a 100644
--- a/fe/src/lib/DataView.svelte
+++ b/fe/src/lib/DataView.svelte
@@ -1,10 +1,11 @@
+
+
diff --git a/fe/src/lib/errors.ts b/fe/src/lib/errors.ts
index d44bec5..81f7145 100644
--- a/fe/src/lib/errors.ts
+++ b/fe/src/lib/errors.ts
@@ -1,7 +1,5 @@
export class UnauthorizedError extends Error {
- constructor(message?: string, options?: ErrorOptions) {
- super(message, options);
+ constructor(message?: string) {
+ super(message);
}
}
-
-
diff --git a/fe/src/lib/utils.ts b/fe/src/lib/utils.ts
index 22d4e9a..e78556c 100644
--- a/fe/src/lib/utils.ts
+++ b/fe/src/lib/utils.ts
@@ -1,5 +1,5 @@
export function processFormInput(form: HTMLFormElement) {
- const formData = new FormData(form);
+ const formData: FormData = new FormData(form);
const data: Record
= {};
for (let field of formData) {
const [key, value] = field;
diff --git a/fe/src/stores/auth.ts b/fe/src/stores/auth.ts
index 0efc80b..63f027e 100644
--- a/fe/src/stores/auth.ts
+++ b/fe/src/stores/auth.ts
@@ -1,100 +1,87 @@
-import type { Invalidator, Subscriber, Unsubscriber } from 'svelte/store';
-import type { Preference } from '../types';
-import { writable, derived } from 'svelte/store';
+import type { Preference, TokenStore, Nullable, UserStore, User, PreferenceStore } from "../types";
+import { writable, derived } from "svelte/store";
-type Nullable = T | null;
-
-interface User {
- uuid: string;
- username: string;
-}
-
-interface TokenStore {
- subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber,
- authenticate: (newToken: string) => void,
- unauthenticate: () => void
-}
-
-
-interface UserStore {
- subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber,
- setUser: (user: User) => void,
- reset: () => void
-}
-
-interface PreferenceStore {
- subscribe: (run: Subscriber, invalidate?: Invalidator) => Unsubscriber,
- set: (this: void, value: Preference) => void
-}
function createTokenStore(): TokenStore {
- const storedToken = localStorage.getItem("token");
- const { subscribe, set } = writable(storedToken);
-
- function authenticate(newToken: string): void {
- try {
- localStorage.setItem("token", newToken);
- set(newToken);
- } catch (e) {
- console.error('error', e);
+ const storedToken = localStorage.getItem("token");
+ const { subscribe, set } = writable(storedToken);
+
+ function authenticate(newToken: string): void {
+ try {
+ localStorage.setItem("token", newToken);
+ set(newToken);
+ } catch (e) {
+ console.error("error", e);
+ }
+ }
+
+ function unauthenticate(): void {
+ localStorage.removeItem("token");
+ set(null);
}
- }
-
- function unauthenticate(): void {
- localStorage.removeItem("token");
- set(null);
- }
-
- return {
- subscribe,
- authenticate,
- unauthenticate
- };
+
+ return {
+ subscribe,
+ authenticate,
+ unauthenticate
+ };
}
function onTokenChange($token: Nullable): boolean {
- return $token ? true : false;
+ return $token ? true : false;
}
function createUserStore(): UserStore {
- const user = localStorage.getItem('user');
- const userObj: Nullable = user ? JSON.parse(user) : null;
- const { subscribe, set } = writable(userObj);
-
- const setUser = (user: User) => {
- localStorage.setItem('user', JSON.stringify(user));
- set(user);
- }
-
- const reset = () => {
- localStorage.removeItem('user');
- set(null);
- }
-
- return {
- subscribe,
- setUser,
- reset
- }
+ const user = localStorage.getItem("user");
+ const userObj: Nullable = user ? JSON.parse(user) : null;
+ const { subscribe, set } = writable(userObj);
+
+ const setUser = (user: User) => {
+ localStorage.setItem("user", JSON.stringify(user));
+ set(user);
+ };
+
+ const reset = () => {
+ localStorage.removeItem("user");
+ set(null);
+ };
+
+ return {
+ subscribe,
+ setUser,
+ reset
+ };
}
function createPreferenceStore(): PreferenceStore {
- const preferences = localStorage.getItem('preferences');
- const preferenceObj: Preference = preferences ? JSON.parse(preferences) : {
- color: "#FF0000",
- size: {
- size: 16,
- unit: 'oz'
- }
- };
-
- const { subscribe, set } = writable(preferenceObj);
-
- return {
- subscribe,
- set
- }
+ const preferences = localStorage.getItem("preferences");
+ const preferenceObj: Preference = preferences ? JSON.parse(preferences) : {
+ id: 0,
+ color: "#FF0000",
+ size_id: 0,
+ user_id: 0
+ };
+
+ const { subscribe, set, update } = writable>(preferenceObj);
+
+ const setPreference = (preference: Preference) => {
+ localStorage.setItem("preference", JSON.stringify(preference));
+ set(preference);
+ };
+
+ const reset = () => {
+ localStorage.removeItem("preference");
+ set(null);
+ };
+
+ return {
+ set,
+ subscribe,
+ reset,
+ update,
+ setPreference,
+ };
}
export const token = createTokenStore();
diff --git a/fe/src/types.ts b/fe/src/types.ts
index 526e7eb..c8f2f00 100644
--- a/fe/src/types.ts
+++ b/fe/src/types.ts
@@ -1,14 +1,19 @@
-export interface Size {
- size: number;
- unit: string;
-}
+import type { Invalidator, Subscriber, Unsubscriber, Updater } from "svelte/store";
export interface Preference {
+ id: number;
color: string;
- size: Size;
+ size_id: number;
+ user_id: number;
+}
+
+export interface Size {
+ size: number;
+ unit: string;
}
export interface User {
+ id: number;
name: string;
uuid: string;
}
@@ -17,4 +22,32 @@ export interface Statistic {
user_id: string;
date: string;
quantity: number;
-}
\ No newline at end of file
+}
+
+export type Nullable = T | null;
+
+export interface User {
+ uuid: string;
+ username: string;
+}
+
+export interface TokenStore {
+ subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber,
+ authenticate: (newToken: string) => void,
+ unauthenticate: () => void
+}
+
+
+export interface UserStore {
+ subscribe: (run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber,
+ setUser: (user: User) => void,
+ reset: () => void
+}
+
+export interface PreferenceStore {
+ set: (this: void, value: Preference) => void;
+ subscribe: (this: void, run: Subscriber>, invalidate?: Invalidator>) => Unsubscriber;
+ reset: () => void;
+ update: (this: void, updater: Updater>) => void;
+ setPreference: (user: Preference) => void;
+}
--
cgit v1.1
From c4e5776f9e174fe6bf91721649c0541a9fb310ae Mon Sep 17 00:00:00 2001
From: Zach Berwaldt
Date: Fri, 15 Mar 2024 21:41:12 -0400
Subject: add env samples, move files
---
api/.env.sample | 10 ++++++++++
api/cmd/main.go | 13 +++++++++----
api/internal/config/config.go | 17 +++++++++++++++++
api/internal/database/database.go | 16 +++++++++-------
fe/.env.sample | 1 +
fe/src/errors.ts | 5 +++++
fe/src/lib/errors.ts | 5 -----
fe/src/lib/utils.ts | 9 ---------
fe/src/utils.ts | 9 +++++++++
9 files changed, 60 insertions(+), 25 deletions(-)
create mode 100644 api/.env.sample
create mode 100644 api/internal/config/config.go
create mode 100644 fe/.env.sample
create mode 100644 fe/src/errors.ts
delete mode 100644 fe/src/lib/errors.ts
delete mode 100644 fe/src/lib/utils.ts
create mode 100644 fe/src/utils.ts
diff --git a/api/.env.sample b/api/.env.sample
new file mode 100644
index 0000000..6e25893
--- /dev/null
+++ b/api/.env.sample
@@ -0,0 +1,10 @@
+# user for test
+TEST_USER=user1
+# test user password
+TEST_PASS=12345
+# database path
+DB_PATH="path/to/database/file"
+# database driver
+DB_DRIVER="sqlite3"
+# port
+PORT=":8080"
\ No newline at end of file
diff --git a/api/cmd/main.go b/api/cmd/main.go
index d97c942..c23eff1 100644
--- a/api/cmd/main.go
+++ b/api/cmd/main.go
@@ -1,16 +1,21 @@
package main
import (
- "water/api/internal/database"
+ "log"
+ "water/api/internal/config"
"water/api/internal/router"
)
func main() {
- database.SetupDatabase()
+ c, err := config.Load()
+ if err != nil {
+ log.Fatalf("Error while reading config file %s", err)
+ }
+
r := router.SetupRouter()
// Listen and Server in 0.0.0.0:8080
- err := r.Run(":8080")
+ err = r.Run(c.GetString("PORT"))
if err != nil {
- return
+ log.Fatal(err)
}
}
diff --git a/api/internal/config/config.go b/api/internal/config/config.go
new file mode 100644
index 0000000..1892696
--- /dev/null
+++ b/api/internal/config/config.go
@@ -0,0 +1,17 @@
+package config
+
+import (
+ "fmt"
+ "github.com/spf13/viper"
+)
+
+func Load() (*viper.Viper, error) {
+ v := viper.New()
+ v.SetConfigFile(".env")
+ v.AddConfigPath(".")
+ err := v.ReadInConfig()
+ if err != nil {
+ return nil, fmt.Errorf("error reading .env file: %s", err)
+ }
+ return v, nil
+}
\ No newline at end of file
diff --git a/api/internal/database/database.go b/api/internal/database/database.go
index 7af9780..1866655 100644
--- a/api/internal/database/database.go
+++ b/api/internal/database/database.go
@@ -4,17 +4,19 @@ import (
"database/sql"
_ "github.com/mattn/go-sqlite3"
"log"
+ "path/filepath"
+ "water/api/internal/config"
)
-func SetupDatabase() {
- _, err := sql.Open("sqlite3", "water.sqlite3")
+func EstablishDBConnection() *sql.DB {
+ c, err := config.Load()
+
+ driver := c.GetString("DB_DRIVER")
+ path, err := filepath.Abs(c.GetString("DB_PATH"))
if err != nil {
- log.Fatal(err)
+ log.Fatal("There was and error getting the absolute path of the database.")
}
-}
-
-func EstablishDBConnection() *sql.DB {
- db, err := sql.Open("sqlite3", "../db/water.sqlite3")
+ db, err := sql.Open(driver, path)
if err != nil {
panic(err)
}
diff --git a/fe/.env.sample b/fe/.env.sample
new file mode 100644
index 0000000..60c383f
--- /dev/null
+++ b/fe/.env.sample
@@ -0,0 +1 @@
+VITE_API_BASE_URL="https://www.example.org"
\ No newline at end of file
diff --git a/fe/src/errors.ts b/fe/src/errors.ts
new file mode 100644
index 0000000..81f7145
--- /dev/null
+++ b/fe/src/errors.ts
@@ -0,0 +1,5 @@
+export class UnauthorizedError extends Error {
+ constructor(message?: string) {
+ super(message);
+ }
+}
diff --git a/fe/src/lib/errors.ts b/fe/src/lib/errors.ts
deleted file mode 100644
index 81f7145..0000000
--- a/fe/src/lib/errors.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class UnauthorizedError extends Error {
- constructor(message?: string) {
- super(message);
- }
-}
diff --git a/fe/src/lib/utils.ts b/fe/src/lib/utils.ts
deleted file mode 100644
index e78556c..0000000
--- a/fe/src/lib/utils.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export function processFormInput(form: HTMLFormElement) {
- const formData: FormData = new FormData(form);
- const data: Record = {};
- for (let field of formData) {
- const [key, value] = field;
- data[key] = value;
- }
- return data;
-}
diff --git a/fe/src/utils.ts b/fe/src/utils.ts
new file mode 100644
index 0000000..e78556c
--- /dev/null
+++ b/fe/src/utils.ts
@@ -0,0 +1,9 @@
+export function processFormInput(form: HTMLFormElement) {
+ const formData: FormData = new FormData(form);
+ const data: Record = {};
+ for (let field of formData) {
+ const [key, value] = field;
+ data[key] = value;
+ }
+ return data;
+}
--
cgit v1.1
From cc49361bcbf689510035e7bbdcce9d8467a36282 Mon Sep 17 00:00:00 2001
From: Zach Berwaldt
Date: Fri, 15 Mar 2024 21:45:01 -0400
Subject: add newline, clean up test
---
api/cmd/main_test.go | 10 ++--------
api/internal/config/config.go | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/api/cmd/main_test.go b/api/cmd/main_test.go
index 049cf6e..a4db57a 100644
--- a/api/cmd/main_test.go
+++ b/api/cmd/main_test.go
@@ -8,15 +8,12 @@ import (
"testing"
"water/api/internal/router"
- "github.com/spf13/viper"
"github.com/stretchr/testify/assert"
+ "water/api/internal/config"
)
func getTestUserCredentials() (string, string) {
- viper.SetConfigFile("../.env")
- viper.AddConfigPath(".")
- viper.AutomaticEnv()
- err := viper.ReadInConfig()
+ viper, err := config.Load()
if err != nil {
log.Fatalf("Error while reading config file %s", err)
}
@@ -31,9 +28,6 @@ func TestAuthRoute(t *testing.T) {
username, password := getTestUserCredentials()
- log.Println("username", username)
- log.Println("password", password)
-
w := httptest.NewRecorder()
req, err := http.NewRequest("POST", "/api/v1/auth", nil)
if err != nil {
diff --git a/api/internal/config/config.go b/api/internal/config/config.go
index 1892696..d54e40e 100644
--- a/api/internal/config/config.go
+++ b/api/internal/config/config.go
@@ -14,4 +14,4 @@ func Load() (*viper.Viper, error) {
return nil, fmt.Errorf("error reading .env file: %s", err)
}
return v, nil
-}
\ No newline at end of file
+}
--
cgit v1.1
From fd1332a3df191577e91c6d846a8b5db1747099fd Mon Sep 17 00:00:00 2001
From: Zach Berwaldt
Date: Fri, 15 Mar 2024 22:00:10 -0400
Subject: cleanup
---
api/internal/router/router.go | 8 ++++----
fe/src/lib/DataView.svelte | 7 ++++---
fe/src/lib/LoginForm.svelte | 3 ++-
fe/src/lib/PreferencesForm.svelte | 15 ++++++++-------
fe/src/lib/forms/AddForm.svelte | 3 ++-
fe/src/utils.ts | 5 +++++
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/api/internal/router/router.go b/api/internal/router/router.go
index 3c86b8c..a71c3e6 100644
--- a/api/internal/router/router.go
+++ b/api/internal/router/router.go
@@ -30,10 +30,10 @@ func SetupRouter() *gin.Engine {
stats := api.Group("/stats")
stats.Use(middleware.TokenRequired())
{
- stats.GET("/", controllers.GetAllStatistics)
- stats.POST("/", controllers.PostNewStatistic)
- stats.GET("weekly/", controllers.GetWeeklyStatistics)
- stats.GET("daily/", controllers.GetDailyUserStatistics)
+ stats.GET("", controllers.GetAllStatistics)
+ stats.POST("", controllers.PostNewStatistic)
+ stats.GET("weekly", controllers.GetWeeklyStatistics)
+ stats.GET("daily", controllers.GetDailyUserStatistics)
stats.GET("user/:uuid", controllers.GetUserStatistics)
stats.PATCH("user/:uuid", controllers.UpdateUserStatistic)
stats.DELETE("user/:uuid", controllers.DeleteUserStatistic)
diff --git a/fe/src/lib/DataView.svelte b/fe/src/lib/DataView.svelte
index 5e81a5a..ffc2fe8 100644
--- a/fe/src/lib/DataView.svelte
+++ b/fe/src/lib/DataView.svelte
@@ -9,6 +9,7 @@
import Card from "./Card.svelte";
import Column from "./Column.svelte";
import AddForm from "./forms/AddForm.svelte";
+ import { apiURL } from "../utils";
let json: Promise;
@@ -24,7 +25,7 @@
let userTotalsData: number[];
async function fetchData() {
- const res = await fetch("http://localhost:8080/api/v1/stats/", {
+ const res = await fetch(apiURL("stats"), {
method: "GET",
headers: {
Authorization: `Bearer ${$token}`
@@ -38,7 +39,7 @@
}
async function fetchDailyUserStatistics() {
- const res = await fetch("http://localhost:8080/api/v1/stats/daily/", {
+ const res = await fetch(apiURL("stats/daily"), {
method: "GET",
headers: {
Authorization: `Bearer ${$token}`
@@ -57,7 +58,7 @@
}
async function fetchWeeklyTotals() {
- const res = await fetch("http://localhost:8080/api/v1/stats/weekly/", {
+ const res = await fetch(apiURL("stats/weekly"), {
method: "GET",
headers: {
Authorization: `Bearer ${$token}`
diff --git a/fe/src/lib/LoginForm.svelte b/fe/src/lib/LoginForm.svelte
index 8c3c288..cf5febf 100644
--- a/fe/src/lib/LoginForm.svelte
+++ b/fe/src/lib/LoginForm.svelte
@@ -1,6 +1,7 @@