wcrisman/DistrictCentral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up the copied project & got the Google authentication working. A lot of work still needs to be done to add content and allow only certain users access.

Browse Source
This commit is contained in:
DESKTOP-C9V2M01\Zeeri
2022-03-09 07:55:26 -08:00
parent c61ca6b32e
commit 9e0e231152
16 changed files with 257 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imports/api/index.js
View File

@@ -1,2 +1,2 @@
import "./tasks.js";
import "./users.js";
import "./records.js";
import "./users.js";

40
imports/api/records.js Normal file
View File

@@ -0,0 +1,40 @@
import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
import { check } from 'meteor/check';
export const Records = new Mongo.Collection('records');
if (Meteor.isServer) {
// This code only runs on the server
Meteor.publish('records', function() {
return Records.find({});
});
}
Meteor.methods({
// 'tasks.setChecked'(taskId, setChecked) {
// check(taskId, String);
// check(setChecked, Boolean);
//
// const task = Tasks.findOne(taskId);
// if (task.private && task.owner !== this.userId) {
// // If the task is private, make sure only the owner can check it off
// throw new Meteor.Error('not-authorized');
// }
//
// Tasks.update(taskId, { $set: { checked: setChecked } });
// },
// 'tasks.setPrivate'(taskId, setToPrivate) {
// check(taskId, String);
// check(setToPrivate, Boolean);
//
// const task = Tasks.findOne(taskId);
//
// // Make sure only the task owner can make a task private
// if (task.owner !== this.userId) {
// throw new Meteor.Error('not-authorized');
// }
//
// Tasks.update(taskId, { $set: { private: setToPrivate } });
// },
});

71
imports/api/tasks.js
View File

@@ -1,71 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
import { check } from 'meteor/check';
export const Tasks = new Mongo.Collection('tasks');
if (Meteor.isServer) {
// This code only runs on the server
Meteor.publish('tasks', function tasksPublication() {
return Tasks.find({
$or: [
{ private: { $ne: true } },
{ owner: this.userId },
],
});
});
}
Meteor.methods({
'tasks.insert'(text) {
check(text, String);
// Make sure the user is logged in before inserting a task
if (!this.userId) {
throw new Meteor.Error('not-authorized');
}
Tasks.insert({
text,
createdAt: new Date(),
owner: this.userId,
username: Meteor.users.findOne(this.userId).username,
});
},
'tasks.remove'(taskId) {
check(taskId, String);
const task = Tasks.findOne(taskId);
if (task.private && task.owner !== this.userId) {
// If the task is private, make sure only the owner can delete it
throw new Meteor.Error('not-authorized');
}
Tasks.remove(taskId);
},
'tasks.setChecked'(taskId, setChecked) {
check(taskId, String);
check(setChecked, Boolean);
const task = Tasks.findOne(taskId);
if (task.private && task.owner !== this.userId) {
// If the task is private, make sure only the owner can check it off
throw new Meteor.Error('not-authorized');
}
Tasks.update(taskId, { $set: { checked: setChecked } });
},
'tasks.setPrivate'(taskId, setToPrivate) {
check(taskId, String);
check(setToPrivate, Boolean);
const task = Tasks.findOne(taskId);
// Make sure only the task owner can make a task private
if (task.owner !== this.userId) {
throw new Meteor.Error('not-authorized');
}
Tasks.update(taskId, { $set: { private: setToPrivate } });
},
});

41
imports/api/tasks.tests.js
View File

@@ -1,41 +0,0 @@
/* eslint-env mocha */
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { assert } from 'chai';
import { Tasks } from './tasks.js';
if (Meteor.isServer) {
describe('Tasks', () => {
describe('methods', () => {
const userId = Random.id();
let taskId;
beforeEach(() => {
Tasks.remove({});
taskId = Tasks.insert({
text: 'test task',
createdAt: new Date(),
owner: userId,
username: 'tmeasday',
});
});
it('can delete owned task', () => {
// Find the internal implementation of the task method so we can
// test it in isolation
const deleteTask = Meteor.server.method_handlers['tasks.remove'];
// Set up a fake method invocation that looks like what the method expects
const invocation = { userId };
// Run the method with `this` set to the fake invocation
deleteTask.apply(invocation, [taskId]);
// Verify that the method does what we expected
assert.equal(Tasks.find().count(), 0);
});
});
});
}

10
imports/startup/accounts-config.js
View File

@@ -1,5 +1,11 @@
import { Accounts } from 'meteor/accounts-base';
import { Accounts } from 'meteor/accounts-base'
Accounts.ui.config({
passwordSignupFields: 'USERNAME_ONLY'
});
});
Accounts.config({
restrictCreationByEmailDomain: function(address) {
return new RegExp('.*@avpanthers.org$', 'i').test(address)
}
});

99
imports/ui/App.svelte
View File

@@ -3,51 +3,41 @@
import {onMount} from 'svelte';
import {useTracker} from 'meteor/rdb:svelte-meteor-data';
import {BlazeTemplate} from 'meteor/svelte:blaze-integration';
import Task from './Task.svelte';
import {Tasks} from '../api/tasks.js'
import {Records} from '../api/records.js'
import ServiceConfiguration from "meteor/service-configuration";
let newTask = "";
let hideCompleted = false;
let tasks;
let currentUser;
onMount(async () => {
Meteor.subscribe('tasks');
// Meteor.subscribe('records');
});
$: incompleteCount = useTracker(() => Tasks.find({checked: {$ne: true}}).count());
// $: incompleteCount = useTracker(() => Tasks.find({checked: {$ne: true}}).count());
$: currentUser = useTracker(() => Meteor.user());
const taskStore = Tasks.find({}, {sort: {createdAt: -1}});
$: {
tasks = $taskStore;
if (hideCompleted) {
tasks = tasks.filter(task => !task.checked);
}
}
// const taskStore = Tasks.find({}, {sort: {createdAt: -1}});
// $: {
// tasks = $taskStore;
// if (hideCompleted) {
// tasks = tasks.filter(task => !task.checked);
// }
// }
function handleSubmit(event) {
Meteor.call("tasks.insert", newTask);
// Clear form
newTask = "";
}
// function handleSubmit(event) {
// Meteor.call("tasks.insert", newTask);
// // Clear form
// newTask = "";
// }
function performLogin() {
//console.log("In Perform Login");
//Meteor.call("users.login");
let config = ServiceConfiguration.configurations.findOne({service: 'google'});
console.log(config);
let scope = config.scope;
let loginStyle = "popup";
Meteor.loginWithGoogle({requestPermissions: scope, loginStyle, requestOfflineToken: true}, (err) => {
//Login style can be "popup" or "redirect". I am not sure we need to request and offline token.
Meteor.loginWithGoogle({loginStyle: "popup", requestOfflineToken: true}, (err) => {
if(err) {
console.log(err);
}
else {
console.log("Logged in");
//console.log("Logged in");
}
})
}
@@ -59,42 +49,39 @@
<div class="container">
<header>
<h1>Todo List ({ $incompleteCount })</h1>
<label className="hide-completed">
<input
type="checkbox"
bind:checked={hideCompleted}
/>
Hide Completed Tasks
</label>
<!-- <h1>Todo List ({ $incompleteCount })</h1>-->
<!-- <label className="hide-completed">-->
<!-- <input-->
<!-- type="checkbox"-->
<!-- bind:checked={hideCompleted}-->
<!-- />-->
<!-- Hide Completed Tasks-->
<!-- </label>-->
<BlazeTemplate template="loginButtons"/>
<!-- <BlazeTemplate template="loginButtons"/>-->
{#if !$currentUser}
<button type="button" on:click={performLogin}>Login</button>
{:else}
<button type="button" on:click={performLogout}>Logout</button>
{/if}
{#if $currentUser}
<form class="new-task" on:submit|preventDefault={handleSubmit}>
<input
type="text"
placeholder="Type to add new tasks"
bind:value={newTask}
/>
</form>
{/if}
<!--{#if $currentUser}-->
<!-- <form class="new-task" on:submit|preventDefault={handleSubmit}>-->
<!-- <input-->
<!-- type="text"-->
<!-- placeholder="Type to add new tasks"-->
<!-- bind:value={newTask}-->
<!-- />-->
<!-- </form>-->
<!--{/if}-->
</header>
<ul>
{#each tasks as task}
<Task
key={task._id}
task={task}
/>
{/each}
<!--{#each tasks as task}-->
<!-- <Task-->
<!-- key={task._id}-->
<!-- task={task}-->
<!-- />-->
<!--{/each}-->
</ul>
<div id="game" style="height: 400px; width: 400px">
</div>
</div>