Skip to content

Conflict #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mamooredesigns wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Conflict #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac6cad
Update README.md
mamooredesigns Jun 5, 2026
a61e1f4
trying to make a conflict
mamooredesigns Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
1. Fork this repository - this makes a copy of all of these files in your own GitHub account
1. Create a github page for this repo
2. use inspect?
//comment not here afterall
131 changes: 9 additions & 122 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,124 +1,11 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<title>Mary Alice Moore</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8">
<link rel="stylesheet" href="style/index.css">

</head>
<body>

<nav id="navigation">
<a class="nav-link" href="#title">About</a>
<a class="nav-link" href="#experience">Experience</a>
<a class="nav-link" href="#skills">Skills</a>
<a class="nav-link" href="#projects">Projects</a>
<a class="nav-link" href="#connect">Message</a>
</nav>
<h1 id="title">Mary Alice Moore</h1>



<section id="about">
<div>
<h2 class="heading">About</h2>
<div id="about-para">
<p>Currently coordinating Code The Dream's classes.</p>
</div>

</div>
</section>



<section id="experience">
<h2 class="heading">Experience</h2>
<div class="ex-box">
<div class="ex-item">
<h3>Coordinating</h3>
<ul class="bullets">
<li>Class Coordinator</li>
<li>Other things</li>
</ul>
</div>
<div class="ex-item">
<h3>Classes</h3>
<ul class="bullets">
<li>Took some</li>
<li>and other things</li>
</ul>
</div>

</section>


<section id="skills">
<h2 class="heading">Skills</h2>
<div class="skills-box">
<ul class="skills">

</ul>
</div>
</section>



<section id="projects">
<h2 class="heading">Projects</h2>
<div class="project-box">
<div class="project-item" id="projects-box">
<ul class="bullets">

</ul>
</div>
</div>
</section>



<section id="connect">
<h2 class="heading">Connect</h2>
<div class="conn-links">
<a class="link" href="mailto:placeholder@gmail.com"> <img class="icon" src="images/email-icon.png" alt="email icon"> </a>
<a class="link" href="https://github.com/mamooredesigns"> <img class="icon" src="images/git-icon.png" alt="GitHub icon"> </a>
<img class="icon" src="images/linkedin-icon.png" alt="LinkedIn icon">
</div>
</section>



<section id="message-form-section">
<h2 class="heading">Send Me a Message</h2>
<form name="connectWithUsers" class="message-form">
<label for="usersName">Your Name:<br></label>
<input type="text" id="usersName" required="true"
/><br />
<label for="usersEmail">Your Email:<br></label>
<input type="email" id="usersEmail" required="true"
/><br />
<label for="usersMessage">Write Your Message Here:<br></label>
<textarea name="usersMessage" id="usersMessage" required="true"
></textarea>
<br />
<button type="submit" value="submit" name="submit" class="submit-button">Submit</button>
</form>
</section>



<section id="message-section">
<h2 class="heading">Messages</h2>
<ul id="messages"></ul>
</section>



<script src="js/index.js">

</script>



</body>
<html>
<head>
<title>Sample Page</title>
<style type="text/css" src="style/index.css"></style>
</head>
<body>
<h1>This is a sample page with a simple error to demonstrate console errors.</h1>
<script src="js/index.js"></script>
</body>
</html>
98 changes: 1 addition & 97 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,101 +9,5 @@ document.body.append(foot);


let today = new Date();
let thisYear = today.getFullYear();
let thisYear = today.getFlulYear();


//copyright section, which uses the Date/Year and appends to the footer


const copyright = document.createElement('p');
copyright.innerHTML = "© Mary Alice Moore " + thisYear;

foot.appendChild(copyright);


//skills section


const skills = ["Python", "JavaScript", "CLass Coordinating", "HTML", "CSS"];
const skillsSection = document.querySelector(".skills");

for (let i = 0; i < skills.length; i++) {
let skillBubble = document.createElement('li');
console.log(skillBubble);
skillsSection.appendChild(skillBubble);
skillBubble.innerHTML = skills[i];
};


//getting info from GitHub via Fetch and sticking it in the elements


fetch("https://api.github.com/users/mamooredesigns/repos")
.then((response) => {
if (response.ok) {
return response.text();
} else {
throw new Error("Whoops! We've got an error!");
}
})
.then((data) => {
const repositories = JSON.parse(data);
//console.log(repositories);

const projectSection = document.getElementById("projects-box");
let projectList = projectSection.querySelector("ul");
projectSection.appendChild(projectList);

for(let repository of repositories) {
let project = document.createElement("li");
project.innerHTML = `<a class="proj-link" href="${repository.html_url}">${repository.name}</a>`;
projectList.appendChild(project);
}
})
.catch((error) => {
console.error("Try again later...", error.message)
});


//message section


let messageForm = document.querySelector("[name='connectWithUsers']");
let messageSection = document.getElementById("message-section");
let messageList = messageSection.querySelector("ul");
messageSection.hidden = true;


//Count messages


let idCounter = 0;

function makeID() {
return 'entry' + idCounter++;
}

let entryByID = {};


//submit button


messageForm.addEventListener('submit', (event) => {
event.preventDefault();
let name = event.target.usersName.value;
let email = event.target.usersEmail.value;
let message = event.target.usersMessage.value;

let uid = makeID();
let newMessage = document.createElement('li');
newMessage.classList.add('message-item');
newMessage.innerHTML = `<a href="mailto:${email}">${name}</a><span> wrote: <br> ${ message }<br></span>`;
newMessage.setAttribute('id', uid);

entryByID[uid] = { usersName: name, usersEmail: email, usersMessage: message };

messageList.appendChild(newMessage);
messageForm.reset();
messageSection.hidden = false;
});