Codi-T03 · TaghridOmarTaleb · Dec 1, 2022 · Dec 1, 2022 · Dec 2, 2022 · Dec 2, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
     "serve": "live-server"
   },
   "devDependencies": {
-    "live-server": "^1.2.1",
     "husky": "^0.14.3",
+    "live-server": "^1.1.0",
     "prettier": "^1.14.2",
     "pretty-quick": "^1.6.0"
   }

diff --git a/part-1/4-links-scripts/js/convertUrls.js b/part-1/4-links-scripts/js/convertUrls.js
diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css
diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css
diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css
diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css
diff --git a/part-3/24-dietary/index.html b/part-3/24-dietary/index.html
diff --git a/part-3/25-shirt-size/styles.css b/part-3/25-shirt-size/styles.css
diff --git a/part-1/1-parent-child/index.html → week-1/1-parent-child/index.html b/part-1/1-parent-child/index.html → week-1/1-parent-child/index.html
@@ -27,6 +27,7 @@
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
+          <span class="message__time">7:15pm</span>
         </div>
       </div>
     </div>

diff --git a/part-1/1-parent-child/readme.md → week-1/1-parent-child/readme.md b/part-1/1-parent-child/readme.md → week-1/1-parent-child/readme.md
diff --git a/part-1/2-html-attributes/index.html → week-1/2-html-attributes/index.html b/part-1/2-html-attributes/index.html → week-1/2-html-attributes/index.html
@@ -23,14 +23,15 @@
         <div class="message">
           <div class="message__author">Luke</div>
           <p class="message__content">
-            Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+            Let's meet at the <a href="https://goo.gl/maps/aza4h9nUBhn"> icafe</a> in Merchant City.
           </p>
           <span class="message__time">7:35pm</span>
         </div>
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+            Ok!
+            <img src=" https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" width="400px" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>

diff --git a/part-1/2-html-attributes/readme.md → week-1/2-html-attributes/readme.md b/part-1/2-html-attributes/readme.md → week-1/2-html-attributes/readme.md
diff --git a/part-1/3-semantic-html/index.html → week-1/3-semantic-html/index.html b/part-1/3-semantic-html/index.html → week-1/3-semantic-html/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -12,30 +14,30 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
+      <header role="banner" class="site-header">
         <div class="site-header__title">Messages</div>
-      </div>
-      <div class="messages">
-        <div class="message">
+      </header>
+      <main role="main" class="messages">
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">Where should we meet later?</p>
-          <span class="message__time">Mar 25, 2018 7:25pm</span>
-        </div>
-        <div class="message">
+          <time datetime="2018-03-25T19:25" class="message__time">Mar 25, 2018 7:25pm</time>
+        </article>
+        <article class="message">
           <div class="message__author">Luke</div>
           <p class="message__content">
             Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
           </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          <time datetime="2018-03-25T19:35" class="message__time">Mar 25, 2018 7:35pm</time>
+        </article>
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
             Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
           </p>
-          <span class="message__time">Mar 25, 2018 7:38pm</span>
-        </div>
-      </div>
+          <time datetime="2018-03-25T19:38" class="message__time">Mar 25, 2018 7:38pm</time>
+        </article>
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>

diff --git a/part-1/3-semantic-html/readme.md → week-1/3-semantic-html/readme.md b/part-1/3-semantic-html/readme.md → week-1/3-semantic-html/readme.md
diff --git a/...-1/4-links-scripts/css/missing-styles.css → ...-1/4-links-scripts/css/missing-styles.css b/...-1/4-links-scripts/css/missing-styles.css → ...-1/4-links-scripts/css/missing-styles.css
@@ -1,3 +1,5 @@
+missing-styles.css
+
 /* Base site colors and fonts */
 body,
 html {

diff --git a/part-1/4-links-scripts/index.html → week-1/4-links-scripts/index.html b/part-1/4-links-scripts/index.html → week-1/4-links-scripts/index.html
@@ -4,34 +4,36 @@
     <meta charset="utf-8" />
     <title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" href="css/missing-styles.css" />
   </head>
 
   <body>
     <div class="site-wrapper">
       <div class="site-header">
-        <div class="site-header__title">Messages</div>
+        <div class="site-headertitle">Messages</div>
       </div>
       <div class="messages">
         <div class="message">
-          <div class="message__author">Won</div>
-          <p class="message__content">Where should we meet later?</p>
-          <time class="message__time">7:25pm</time>
+          <div class="messageauthor">Won</div>
+          <p class="messagecontent">Where should we meet later?</p>
+          <time class="messagetime">7:25pm</time>
         </div>
         <div class="message">
-          <div class="message__author">Luke</div>
-          <p class="message__content">
+          <div class="messageauthor">Luke</div>
+          <p class="messagecontent">
             Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
           </p>
-          <time class="message__time">7:35pm</time>
+          <time class="messagetime">7:35pm</time>
         </div>
         <div class="message">
-          <div class="message__author">Won</div>
-          <p class="message__content">
+          <div class="messageauthor">Won</div>
+          <p class="messagecontent">
             No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42
           </p>
-          <time class="message__time">7:38pm</time>
+          <time class="messagetime">7:38pm</time>
         </div>
       </div>
     </div>
+    <script src="js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/week-1/4-links-scripts/js/convertUrls.js b/week-1/4-links-scripts/js/convertUrls.js
@@ -0,0 +1,24 @@
+convertUrls.js(
+  /**
+   * Convert URLs in messages into links
+   */
+  function() {
+    var messages = document.querySelectorAll(".message__content");
+    if (!messages.length) {
+      alert(
+        "You have linked the JavaScript, but not at the correct location in the code. The script tag must be added near the end of the <body> tag."
+      );
+    }
+    messages.forEach(function(message) {
+      var urls = message.innerHTML.match(/\bhttps?:\/\/\S+/gi);
+      if (urls) {
+        urls.forEach(function(url) {
+          message.innerHTML = message.innerHTML.replace(
+            url,
+            '<a href="' + url + '">' + url + "</a>"
+          );
+        });
+      }
+    });
+  }
+)();
diff --git a/part-1/4-links-scripts/readme.md → week-1/4-links-scripts/readme.md b/part-1/4-links-scripts/readme.md → week-1/4-links-scripts/readme.md
diff --git a/part-1/5-css-selectors/index.html → week-1/5-css-selectors/index.html b/part-1/5-css-selectors/index.html → week-1/5-css-selectors/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
@@ -0,0 +1,22 @@
+/* Add your CSS code below */
+message-backgrounds.css
+
+/* Add your CSS code below */
+
+/*First message */
+
+div[id="first-message"] {
+  background-color: red;
+}
+
+/*Second message */
+
+article:nth-child(2) {
+  background: cadetblue;
+}
+
+/*Third message */
+
+div[class="message--latest"] {
+  background-color: yellow;
+}
diff --git a/part-1/5-css-selectors/readme.md → week-1/5-css-selectors/readme.md b/part-1/5-css-selectors/readme.md → week-1/5-css-selectors/readme.md
diff --git a/part-1/6-css-properties/index.html → week-1/6-css-properties/index.html b/part-1/6-css-properties/index.html → week-1/6-css-properties/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/part-1/6-css-properties/readme.md → week-1/6-css-properties/readme.md b/part-1/6-css-properties/readme.md → week-1/6-css-properties/readme.md
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
@@ -0,0 +1,26 @@
+/* Add your CSS code below */
+styles.css
+
+/* Add your CSS code below */
+
+/* Add Color to The Links */
+a {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+.message__time {
+  font-size: 0.9rem;
+}
+
+.message--unread {
+  border-left: 2px blue solid;
+}
+
+.messages div:first-child {
+  opacity: 0.5;
+}
+.message {
+  line-height: 27px;
+}
diff --git a/part-1/7-css-box/index.html → week-1/7-css-box/index.html b/part-1/7-css-box/index.html → week-1/7-css-box/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/part-1/7-css-box/readme.md → week-1/7-css-box/readme.md b/part-1/7-css-box/readme.md → week-1/7-css-box/readme.md
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -0,0 +1,18 @@
+/* Try different box model properties below */
+styles.css
+
+/* Try different box model properties below */
+.pages__page {
+  border: 1px solid #4491db;
+  border-radius: 4px;
+  background: #fff;
+  width: 100%;
+  height: 100%;
+  padding: 2px 5px;
+  margin: 5px;
+}
+
+.pages__showing {
+  padding: 0px 5px;
+  margin: 0px 5px;
+}
diff --git a/part-1/8-advanced-selectors/index.html → week-1/8-advanced-selectors/index.html b/part-1/8-advanced-selectors/index.html → week-1/8-advanced-selectors/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/part-1/8-advanced-selectors/readme.md → week-1/8-advanced-selectors/readme.md b/part-1/8-advanced-selectors/readme.md → week-1/8-advanced-selectors/readme.md
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -0,0 +1,16 @@
+/* Try different box model properties below */
+styles.css
+
+/* Try different box model properties below */
+.site-header p:nth-child(2) {
+  color: white;
+  margin-bottom: 0;
+}
+.site-footer {
+  font-size: 12px;
+
+  text-align: center;
+}
+.message:last-child {
+  box-shadow: 4px 4px #dba944;
+}
diff --git a/part-1/9-git-branch/index.html → week-1/9-git-branch/index.html b/part-1/9-git-branch/index.html → week-1/9-git-branch/index.html
@@ -1,3 +1,5 @@
+index.html
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/part-1/9-git-branch/readme.md → week-1/9-git-branch/readme.md b/part-1/9-git-branch/readme.md → week-1/9-git-branch/readme.md
diff --git a/part-2/18-git-merge/styles.css → week-1/9-git-branch/styles.css b/part-2/18-git-merge/styles.css → week-1/9-git-branch/styles.css
@@ -1,3 +1,5 @@
+styles.css
+
 /* Add your own CSS code below */
 .link {
   color: #4491db;
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ @@
               <p class="message__content">
                 I can meet on Tuesday and Wednesday after 4.
               </p>
+              <span class="message__time">7:15pm</span>
             </div>
           </div>
         </div>
@@ Expand Down @@