Merge branch 'main' of https://github.com/MegumiKim/Social-Media-Howdy

index.html

@@ -10,8 +10,13 @@
     />
     <title>Howdy | Log in</title>
     <link rel="stylesheet" href="/dist/css/styles.css" />
+<<<<<<< HEAD
     <script src="../src/js/index.mjs" type="module"></script>
     <script
+=======
+    <script src="./src/js/index.mjs" type="module"></script>
+    <!-- <script
+>>>>>>> 3e24b00d5ade7e267ce4d7e3b2de39caddf8e5b9
       defer
       src="/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
     ></script>

sign-up/index.html

@@ -9,8 +9,13 @@
       content="Welcome to Howdy. Please provide long in details."
     />
     <title>Howdy | Log in</title>
+<<<<<<< HEAD
     <link rel="stylesheet" href="../dist/css/styles.css" />
     <script src="./../src/js/index.mjs" type="module"></script>
+=======
+    <link rel="stylesheet" href="./../dist/css/styles.css" />
+    <script src="../src/js/index.mjs" type="module"></script>
+>>>>>>> 3e24b00d5ade7e267ce4d7e3b2de39caddf8e5b9
     <script
       src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
       integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4"
@@ -106,7 +111,11 @@ <h4 class="mb-3 text-center">Sign up</h4>
               ></div>
               <hr class="my-4" />
               <p class="w-100 text-center">
+<<<<<<< HEAD
                 Already have have an account? <a href="/">log in</a>
+=======
+                Already have have an account? <a href="./">log in</a>
+>>>>>>> 3e24b00d5ade7e267ce4d7e3b2de39caddf8e5b9
               </p>
             </form>
           </div>

src/js/api/profiles/loginUser.mjs

@@ -1,5 +1,9 @@
 import { BASE_URL } from "./../constants.mjs";
+<<<<<<< HEAD
 import * as storages from "../../storage/index.mjs";
+=======
+import * as storages from "./../../storage/index.mjs";
+>>>>>>> 3e24b00d5ade7e267ce4d7e3b2de39caddf8e5b9
 
 const registerURL = `${BASE_URL}/auth/login`;
 const userAlert = document.querySelector("#user-alert");
@@ -22,7 +26,12 @@ export async function loginUser(options) {
   if (accessToken) {
     storages.locals.save("accessToken", accessToken);
     storages.locals.save("otherDetails", otherDetails);
+<<<<<<< HEAD
     window.location.assign("./posts/index.html");
+=======
+    window.location.href("./posts/");
+    // window.location.assign("./posts/");
+>>>>>>> 3e24b00d5ade7e267ce4d7e3b2de39caddf8e5b9
   } else {
     const { errors } = json;
     errors.forEach(({ message }) => {

src/js/storage/index.mjs

@@ -1,2 +1,2 @@
-export * as locals from "./local.mjs";
-export * as sessions from "./session.mjs";
+export * as locals from "../local.mjs";
+export * as sessions from "../session.mjs";