Archives
/
lemmy
mirror of https://github.com/LemmyNet/lemmy
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
pull/722/head
Dessalines 5 years ago
parent fb82fccd82 03435b5d3a
commit 5481dff9b6
17 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File

22
server/src/api/user.rs
Unescape Escape View File

@ -161,9 +161,27 @@ impl Perform<LoginResponse> for Oper<Register> {
}
};
// Create the main community if it doesn't exist
let main_community: Community = match Community::read_from_name(&conn, "main".to_string()) {
Ok(c) => c,
Err(_e) => {
let community_form = CommunityForm {
name: "main".to_string(),
title: "The Default Community".to_string(),
description: Some("The Default Community".to_string()),
category_id: 1,
creator_id: inserted_user.id,
removed: None,
deleted: None,
updated: None,
};
Community::create(&conn, &community_form).unwrap()
}
};
// Sign them up for main community no matter what
let community_follower_form = CommunityFollowerForm {
community_id: 1,
community_id: main_community.id,
user_id: inserted_user.id,
};
@ -177,7 +195,7 @@ impl Perform<LoginResponse> for Oper<Register> {
// If its an admin, add them as a mod and follower to main
if data.admin {
let community_moderator_form = CommunityModeratorForm {
community_id: 1,
community_id: main_community.id,
user_id: inserted_user.id,
};

6
ui/src/components/communities.tsx
Unescape Escape View File

@ -46,9 +46,7 @@ export class Communities extends Component<any, CommunitiesState> {
}
componentDidMount() {
document.title = "Communities - Lemmy";
let table = document.querySelector('#community_table');
Sortable.initTable(table);
document.title = `Communities - ${WebSocketService.Instance.site.name}`;
}
// Necessary for back button for some reason
@ -176,6 +174,8 @@ export class Communities extends Component<any, CommunitiesState> {
this.state.loading = false;
window.scrollTo(0,0);
this.setState(this.state);
let table = document.querySelector('#community_table');
Sortable.initTable(table);
} else if (op == UserOperation.FollowCommunity) {
let res: CommunityResponse = msg;
let found = this.state.communities.find(c => c.id == res.community.id);

2
ui/src/components/community.tsx
Unescape Escape View File

@ -200,7 +200,7 @@ export class Community extends Component<any, State> {
this.state.community = res.community;
this.state.moderators = res.moderators;
this.state.admins = res.admins;
document.title = `/c/${this.state.community.name} - Lemmy`;
document.title = `/c/${this.state.community.name} - ${WebSocketService.Instance.site.name}`;
this.setState(this.state);
this.fetchPosts();
} else if (op == UserOperation.EditCommunity) {

3
ui/src/components/create-community.tsx
Unescape Escape View File

@ -1,6 +1,7 @@
import { Component } from 'inferno';
import { CommunityForm } from './community-form';
import { Community } from '../interfaces';
import { WebSocketService } from '../services';
export class CreateCommunity extends Component<any, any> {
@ -10,7 +11,7 @@ export class CreateCommunity extends Component<any, any> {
}
componentDidMount() {
document.title = "Create Community - Lemmy";
document.title = `Create Community - ${WebSocketService.Instance.site.name}`;
}
render() {

3
ui/src/components/create-post.tsx
Unescape Escape View File

@ -1,5 +1,6 @@
import { Component } from 'inferno';
import { PostForm } from './post-form';
import { WebSocketService } from '../services';
export class CreatePost extends Component<any, any> {
@ -9,7 +10,7 @@ export class CreatePost extends Component<any, any> {
}
componentDidMount() {
document.title = "Create Post - Lemmy";
document.title = `Create Post - ${WebSocketService.Instance.site.name}`;
}
render() {

2
ui/src/components/inbox.tsx
Unescape Escape View File

@ -49,7 +49,7 @@ export class Inbox extends Component<any, InboxState> {
}
componentDidMount() {
document.title = `/u/${UserService.Instance.user.username} Inbox - Lemmy`;
document.title = `/u/${UserService.Instance.user.username} Inbox - ${WebSocketService.Instance.site.name}`;
}
render() {

2
ui/src/components/login.tsx
Unescape Escape View File

@ -50,7 +50,7 @@ export class Login extends Component<any, State> {
}
componentDidMount() {
document.title = "Login - Lemmy";
document.title = `Login - ${WebSocketService.Instance.site.name}`;
}
render() {

6
ui/src/components/main.tsx
Unescape Escape View File

@ -101,10 +101,6 @@ export class Main extends Component<any, MainState> {
this.subscription.unsubscribe();
}
componentDidMount() {
document.title = "Lemmy";
}
// Necessary for back button for some reason
componentWillReceiveProps(nextProps: any) {
if (nextProps.history.action == 'POP') {
@ -377,6 +373,8 @@ export class Main extends Component<any, MainState> {
this.state.site.site = res.site;
this.state.site.banned = res.banned;
this.setState(this.state);
document.title = `${WebSocketService.Instance.site.name}`;
} else if (op == UserOperation.EditSite) {
let res: SiteResponse = msg;
this.state.site.site = res.site;

2
ui/src/components/modlog.tsx
Unescape Escape View File

@ -45,7 +45,7 @@ export class Modlog extends Component<any, ModlogState> {
}
componentDidMount() {
document.title = "Modlog - Lemmy";
document.title = `Modlog - ${WebSocketService.Instance.site.name}`;
}
setCombined(res: GetModlogResponse) {

2
ui/src/components/post.tsx
Unescape Escape View File

@ -253,7 +253,7 @@ export class Post extends Component<any, PostState> {
this.state.moderators = res.moderators;
this.state.admins = res.admins;
this.state.loading = false;
document.title = `${this.state.post.name} - Lemmy`;
document.title = `${this.state.post.name} - ${WebSocketService.Instance.site.name}`;
this.setState(this.state);
} else if (op == UserOperation.CreateComment) {
let res: CommentResponse = msg;

4
ui/src/components/search.tsx
Unescape Escape View File

@ -52,7 +52,7 @@ export class Search extends Component<any, SearchState> {
}
componentDidMount() {
document.title = "Search - Lemmy";
document.title = `Search - ${WebSocketService.Instance.site.name}`;
}
render() {
@ -250,7 +250,7 @@ export class Search extends Component<any, SearchState> {
let res: SearchResponse = msg;
this.state.searchResponse = res;
this.state.loading = false;
document.title = `Search - ${this.state.q} - Lemmy`;
document.title = `Search - ${this.state.q} - ${WebSocketService.Instance.site.name}`;
window.scrollTo(0,0);
this.setState(this.state);

3
ui/src/components/sponsors.tsx
Unescape Escape View File

@ -1,4 +1,5 @@
import { Component } from 'inferno';
import { WebSocketService } from '../services';
let general =
[
@ -17,7 +18,7 @@ export class Sponsors extends Component<any, any> {
}
componentDidMount() {
document.title = "Sponsors - Lemmy";
document.title = `Sponsors - ${WebSocketService.Instance.site.name}`;
}
render() {

2
ui/src/components/user.tsx
Unescape Escape View File

@ -341,7 +341,7 @@ export class User extends Component<any, UserState> {
this.state.moderates = res.moderates;
this.state.posts = res.posts;
this.state.loading = false;
document.title = `/u/${this.state.user.name} - Lemmy`;
document.title = `/u/${this.state.user.name} - ${WebSocketService.Instance.site.name}`;
window.scrollTo(0,0);
this.setState(this.state);
} else if (op == UserOperation.EditComment) {

1
ui/src/index.html
Unescape Escape View File

@ -6,7 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/favicon.svg" />
<link rel="apple-touch-icon" href="/static/assets/apple-touch-icon.png" />
<title>Lemmy</title>
<link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css">
<script src="/static/assets/libs/sortable/sortable.min.js"></script>
</head>

1
ui/src/services/UserService.ts
Unescape Escape View File

@ -16,7 +16,6 @@ export class UserService {
} else {
console.log('No JWT cookie found.');
}
}
public login(res: LoginResponse) {

1
ui/src/services/WebSocketService.ts
Unescape Escape View File

@ -8,7 +8,6 @@ import { UserService } from './';
export class WebSocketService {
private static _instance: WebSocketService;
public subject: Subject<any>;
public instanceName: string;
public site: Site;
public admins: Array<UserView>;

2
ui/src/version.ts
Unescape Escape View File

@ -1 +1 @@
export let version: string = "v0.0.5-16-gc7d8d5f";
export let version: string = "v0.0.6-0-g27b108a";
Write Preview
Loading…
Cancel
Save