small updates

wagslane · wagslane · commit 57e5fde82fbd · 2023-06-12T16:06:12.000-06:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM --platform=linux/amd64 debian:stretch-slim
+FROM --platform=linux/amd64 debian:stable-slim
+
+RUN apt-get update && apt-get install -y ca-certificates
 
 ADD notely /usr/bin/notely
 
diff --git a/handler_notes.go b/handler_notes.go
@@ -49,5 +49,5 @@ func (cfg *apiConfig) handlerNotesCreate(w http.ResponseWriter, r *http.Request,
 		respondWithError(w, http.StatusNotFound, "Couldn't get note")
 		return
 	}
-	respondWithJSON(w, http.StatusOK, databaseNoteToNote(note))
+	respondWithJSON(w, http.StatusCreated, databaseNoteToNote(note))
 }
diff --git a/handler_user.go b/handler_user.go
@@ -51,7 +51,7 @@ func (cfg *apiConfig) handlerUsersCreate(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	respondWithJSON(w, http.StatusOK, databaseUserToUser(user))
+	respondWithJSON(w, http.StatusCreated, databaseUserToUser(user))
 }
 
 func generateRandomSHA256Hash() (string, error) {
diff --git a/scripts/buildprod.sh b/scripts/buildprod.sh
diff --git a/scripts/migrateup.sh b/scripts/migrateup.sh
@@ -1,4 +1,6 @@
-source .env
+if [ -f .env ]; then
+    source .env
+fi
 
 cd sql/schema
 goose mysql $DATABASE_URL up
diff --git a/static/index.html b/static/index.html
@@ -7,7 +7,7 @@
 </head>
 
 <body class="section">
-    <h1>Notely</h1>
+    <h1>Welcome to Notely</h1>
 
     <div id="userCreationContainer" class="section">
         <input id="nameField" type="text" placeholder="Enter your name">
@@ -37,7 +37,7 @@ <h2>Your Notes</h2>
                 return;
             }
             const noteContent = document.getElementById('newNoteContent').value;
-            const response = await fetch(`${API_BASE}/notes`,
+            const response = await fetchWithAlert(`${API_BASE}/notes`,
                 {
                     method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `ApiKey ${currentUserAPIKey}` },
                     body: JSON.stringify({ note: noteContent })
@@ -47,15 +47,15 @@ <h2>Your Notes</h2>
         }
 
         async function getUser() {
-            const response = await fetch(`${API_BASE}/users`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
+            const response = await fetchWithAlert(`${API_BASE}/users`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
             return await response.json();
         }
 
         async function loadNotes() {
             if (!currentUser) {
                 return;
             }
-            const response = await fetch(`${API_BASE}/notes`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
+            const response = await fetchWithAlert(`${API_BASE}/notes`, { headers: { 'Authorization': `ApiKey ${currentUserAPIKey}` } });
             const notes = await response.json();
             const notesContainer = document.getElementById('notes');
             notesContainer.innerHTML = '';
@@ -71,7 +71,7 @@ <h2>Your Notes</h2>
 
         async function createUser() {
             const nameField = document.getElementById('nameField');
-            const response = await fetch(`${API_BASE}/users`, {
+            const response = await fetchWithAlert(`${API_BASE}/users`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({ name: nameField.value }) // using the value from nameField
@@ -113,6 +113,15 @@ <h2>Your Notes</h2>
             document.getElementById('greetingMessage').textContent = `Hello ${user.name}!`;
         }
 
+        async function fetchWithAlert(url, options) {
+            const response = await fetch(url, options);
+            if (response.status > 299) {
+                alert(`Error: ${response.status}`);
+                return;
+            }
+            return response;
+        }
+
         login();
     </script>
 

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ func (cfg apiConfig) handlerNotesCreate(w http.ResponseWriter, r http.Request,`
`49`	`49`	`respondWithError(w, http.StatusNotFound, "Couldn't get note")`
`50`	`50`	`return`
`51`	`51`	`}`
`52`		`- respondWithJSON(w, http.StatusOK, databaseNoteToNote(note))`
	`52`	`+ respondWithJSON(w, http.StatusCreated, databaseNoteToNote(note))`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (cfg apiConfig) handlerUsersCreate(w http.ResponseWriter, r http.Request)`
`51`	`51`	`return`
`52`	`52`	`}`
`53`	`53`
`54`		`- respondWithJSON(w, http.StatusOK, databaseUserToUser(user))`
	`54`	`+ respondWithJSON(w, http.StatusCreated, databaseUserToUser(user))`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func generateRandomSHA256Hash() (string, error) {`