Skip to content
This repository was archived by the owner on Apr 16, 2022. It is now read-only.

Triggered linting on app-main project #145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion app-main/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
{
"printWidth": 80,
"singleQuote": false,
"tabWidth": 2
"tabWidth": 2,
"useTabs": false,
"overrides": [
{
"files": "*.html",
"options": {
"useTabs": true,
"singleQuote": false
}
},
{
"files": "*.js",
"options": {
"useTabs": false,
"singleQuote": true
}
}
]
}
2 changes: 1 addition & 1 deletion app-main/babel.config.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
presets: [["@babel/preset-env", { targets: { node: "current" } }]],
};
20 changes: 11 additions & 9 deletions app-main/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
var gulp = require('gulp');
var concat = require('gulp-concat');

gulp.task('pack-js', function() {
return gulp.src(['public/js/index.js'])
.pipe(concat('bundle.js'))
.pipe(gulp.dest('public/build/js'))
gulp.task('pack-js', function () {
return gulp
.src(['public/js/index.js'])
.pipe(concat('bundle.js'))
.pipe(gulp.dest('public/build/js'));
});

gulp.task('pack-css', function() {
return gulp.src(['public/css/style.css'])
.pipe(concat('stylesheet.css'))
.pipe(gulp.dest('public/build/css'))
gulp.task('pack-css', function () {
return gulp
.src(['public/css/style.css'])
.pipe(concat('stylesheet.css'))
.pipe(gulp.dest('public/build/css'));
});

gulp.task('default', gulp.series(['pack-js', 'pack-css']));
gulp.task('default', gulp.series(['pack-js', 'pack-css']));
10 changes: 2 additions & 8 deletions app-main/public/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="./css/style_404.css" />
<title>Page Not Found</title>
<meta
name="description"
content="404: Page Not Found"
/>
<meta name="description" content="404: Page Not Found" />
<meta name="twitter:card" content="summary_large_image" />
<meta property="og:title" content="Page Not Found" />
<meta
property="og:description"
content="404: Page Not Found"
/>
<meta property="og:description" content="404: Page Not Found" />
<meta
property="og:image"
content="https://dev-jot.netlify.app/app-main/public/images/share-image.png"
Expand Down
2 changes: 1 addition & 1 deletion app-main/public/css/style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--main-b-color: #35586C;
--main-b-color: #35586c;
--secondary-b-color: #2b2c28;
--tertiary-b-color: #f7b501;
--in-progress: #039dfc;
Expand Down
66 changes: 33 additions & 33 deletions app-main/public/js/events/eventHandlers.js
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
import { quill } from "../quill_init.js";
import { quill } from '../quill_init.js';

// cached document elements
const overlay = document.querySelector(".overlay");
const modalLesson = document.querySelector(".modal-lesson");
const modalLessonTitle = document.querySelector(".modal-lesson-title");
const modalLessonContent = document.querySelector(".modal-lesson-content");
const lessonInput = document.querySelector(".create-lesson-input");
const submitLessonElement = document.querySelector("#submit");
const clearBtn = document.querySelector(".create-lesson-clear");
const tagSelectors = document.querySelector(".tag-selectors");
const overlay = document.querySelector('.overlay');
const modalLesson = document.querySelector('.modal-lesson');
const modalLessonTitle = document.querySelector('.modal-lesson-title');
const modalLessonContent = document.querySelector('.modal-lesson-content');
const lessonInput = document.querySelector('.create-lesson-input');
const submitLessonElement = document.querySelector('#submit');
const clearBtn = document.querySelector('.create-lesson-clear');
const tagSelectors = document.querySelector('.tag-selectors');

export function handleClear(e) {
quill.root.innerHTML = "";
lessonInput.value = "";
clearBtn.setAttribute("hidden", "");
quill.root.innerHTML = '';
lessonInput.value = '';
clearBtn.setAttribute('hidden', '');

const selectedTags = [...tagSelectors.children].filter((tag) =>
tag.classList.contains("selected")
tag.classList.contains('selected')
);

selectedTags.forEach((tag) => {
tag.classList.remove("selected");
tag.classList.remove('selected');
});
}

export function handleViewClick(lesson) {
const title = lesson.querySelector(".lesson-card-title").innerText;
const content = lesson.querySelector(".lesson-card-content").innerHTML;
const title = lesson.querySelector('.lesson-card-title').innerText;
const content = lesson.querySelector('.lesson-card-content').innerHTML;

modalLessonTitle.innerText = title;
modalLessonContent.innerHTML = content;
modalLesson.removeAttribute("hidden");
overlay.removeAttribute("hidden");
overlay.classList.add("dark");
modalLesson.removeAttribute('hidden');
overlay.removeAttribute('hidden');
overlay.classList.add('dark');
}

export function handleClearBtn() {
let textLessonContent = quill.root.innerHTML;
let textTitleContent = document.querySelector(".create-lesson-input");
let textTitleContent = document.querySelector('.create-lesson-input');
if (
textTitleContent.value.length > 0 ||
(textLessonContent.length >= 8 && textLessonContent !== "<p><br></p>")
(textLessonContent.length >= 8 && textLessonContent !== '<p><br></p>')
) {
clearBtn.removeAttribute("hidden");
clearBtn.removeAttribute('hidden');
} else {
clearBtn.setAttribute("hidden", "");
clearBtn.setAttribute('hidden', '');
}
}

export function handleCloseLessonModal() {
modalLessonTitle.innerHTML = "";
modalLessonContent.innerHTML = "";
modalLessonTitle.innerHTML = '';
modalLessonContent.innerHTML = '';

modalLesson.setAttribute("hidden", "");
overlay.setAttribute("hidden", "");
overlay.classList.remove("dark");
modalLesson.setAttribute('hidden', '');
overlay.setAttribute('hidden', '');
overlay.classList.remove('dark');
}

export function handleEscapeLessonModal(event) {
if (event.key === "Escape" || event.keyCode === 27) {
if (event.key === 'Escape' || event.keyCode === 27) {
handleCloseLessonModal();
}
}

export function handleTagVisibility(e) {
const tagSelectors = document.querySelector(".tag-selectors");
tagSelectors.classList.toggle("hidden");
const tagSelectors = document.querySelector('.tag-selectors');
tagSelectors.classList.toggle('hidden');
}

export function handleTagSelect(e) {
const addTagButton = document.querySelector(".add-tag");
const addTagButton = document.querySelector('.add-tag');
let tag = e.target;
tag.classList.toggle("selected");
tag.classList.toggle('selected');
}
38 changes: 19 additions & 19 deletions app-main/public/js/events/eventListeners.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,38 @@ import {
handleViewClick,
handleTagVisibility,
handleTagSelect,
} from "./eventHandlers.js";
import { addLesson } from "../lessons/index.js";
import registerSW from "./serviceWorker.js";
} from './eventHandlers.js';
import { addLesson } from '../lessons/index.js';
import registerSW from './serviceWorker.js';

export default function setEventListeners() {
// cache necessary elements
const overlay = document.querySelector(".overlay");
const modalLessonClose = document.querySelector(".modal-lesson-close");
const formElement = document.querySelector("form");
const clearBtn = document.querySelector(".create-lesson-clear");
const addTagButton = document.querySelector(".add-tag");
const tagSelectors = document.querySelector(".tag-selectors");

formElement.addEventListener("submit", function (e) {
const overlay = document.querySelector('.overlay');
const modalLessonClose = document.querySelector('.modal-lesson-close');
const formElement = document.querySelector('form');
const clearBtn = document.querySelector('.create-lesson-clear');
const addTagButton = document.querySelector('.add-tag');
const tagSelectors = document.querySelector('.tag-selectors');

formElement.addEventListener('submit', function (e) {
e.preventDefault();
addLesson();
});

// Modal event listeners
modalLessonClose.addEventListener("click", handleCloseLessonModal);
overlay.addEventListener("click", handleCloseLessonModal);
document.addEventListener("keydown", handleEscapeLessonModal);
modalLessonClose.addEventListener('click', handleCloseLessonModal);
overlay.addEventListener('click', handleCloseLessonModal);
document.addEventListener('keydown', handleEscapeLessonModal);

clearBtn.addEventListener("click", handleClear);
clearBtn.addEventListener('click', handleClear);

formElement.addEventListener("keyup", handleClearBtn);
formElement.addEventListener('keyup', handleClearBtn);

addTagButton.addEventListener("click", handleTagVisibility);
addTagButton.addEventListener('click', handleTagVisibility);

tagSelectors.addEventListener("click", handleTagSelect);
tagSelectors.addEventListener('click', handleTagSelect);

window.addEventListener("load", () => {
window.addEventListener('load', () => {
registerSW();
});
}
Loading